From 4e4748bc3785309ae021f3b25aa3fe8a1b48c95f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 7 Dec 2003 06:56:30 +0000 Subject: [PATCH] If we already have a pointer grab active with a grab cursor set, destroy 2003-12-07 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already have a pointer grab active with a grab cursor set, destroy that cursor to avoid a GDI resource leak. (#128410, Tim Evans) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/win32/gdkevents-win32.c | 8 ++++++++ 6 files changed, 38 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4bc57a6e4f..4c520c1ece 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-12-07 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already + have a pointer grab active with a grab cursor set, destroy that + cursor to avoid a GDI resource leak. (#128410, Tim Evans) + 2003-12-05 Paisa Seeluangsawat * configure.in: Added Thai (th) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4bc57a6e4f..4c520c1ece 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2003-12-07 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already + have a pointer grab active with a grab cursor set, destroy that + cursor to avoid a GDI resource leak. (#128410, Tim Evans) + 2003-12-05 Paisa Seeluangsawat * configure.in: Added Thai (th) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4bc57a6e4f..4c520c1ece 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2003-12-07 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already + have a pointer grab active with a grab cursor set, destroy that + cursor to avoid a GDI resource leak. (#128410, Tim Evans) + 2003-12-05 Paisa Seeluangsawat * configure.in: Added Thai (th) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4bc57a6e4f..4c520c1ece 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2003-12-07 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already + have a pointer grab active with a grab cursor set, destroy that + cursor to avoid a GDI resource leak. (#128410, Tim Evans) + 2003-12-05 Paisa Seeluangsawat * configure.in: Added Thai (th) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4bc57a6e4f..4c520c1ece 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2003-12-07 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): If we already + have a pointer grab active with a grab cursor set, destroy that + cursor to avoid a GDI resource leak. (#128410, Tim Evans) + 2003-12-05 Paisa Seeluangsawat * configure.in: Added Thai (th) to ALL_LINGUAS. diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index df6673d627..76ccb20e19 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -549,6 +549,14 @@ gdk_pointer_grab (GdkWindow *window, if (return_val == GDK_GRAB_SUCCESS) { p_grab_window = window; + + if (p_grab_cursor != NULL) + { + if (GetCursor () == p_grab_cursor) + SetCursor (NULL); + DestroyCursor (p_grab_cursor); + } + p_grab_cursor = hcursor; if (p_grab_cursor != NULL) -- 2.30.2